From e364ae3ea8ac72e636bb1dd91d98814b655e844e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Florian=20M=C3=BCllner?= Date: Fri, 23 Oct 2015 22:13:30 +0200 Subject: [PATCH] Use gtk_widget_set_focus_on_click() instead of deprecated setters https://bugzilla.gnome.org/show_bug.cgi?id=757269 --- gtk/gtkentry.c | 2 +- gtk/gtkfilechooserdialog.c | 2 +- gtk/gtkpathbar.c | 2 +- gtk/gtkstackswitcher.c | 2 +- gtk/gtktextview.c | 2 +- gtk/gtktoolbar.c | 2 +- gtk/gtktoolbutton.c | 2 +- gtk/gtktoolitemgroup.c | 5 ++--- gtk/inspector/window.c | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index e1d7ab1d09..5783118885 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -9825,7 +9825,7 @@ append_bubble_action (GtkEntry *entry, GtkWidget *item, *image; item = gtk_button_new (); - gtk_button_set_focus_on_click (GTK_BUTTON (item), FALSE); + gtk_widget_set_focus_on_click (item, FALSE); image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); gtk_widget_show (image); gtk_container_add (GTK_CONTAINER (item), image); diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 3f3cf507f8..d96939450a 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -516,7 +516,7 @@ setup_search (GtkFileChooserDialog *dialog) GtkWidget *header; button = gtk_toggle_button_new (); - gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + gtk_widget_set_focus_on_click (button, FALSE); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); image = gtk_image_new_from_icon_name ("edit-find-symbolic", GTK_ICON_SIZE_MENU); gtk_container_add (GTK_CONTAINER (button), image); diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 33d64f6815..51b4fc1a02 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -1575,7 +1575,7 @@ make_directory_button (GtkPathBar *path_bar, button_data->type = find_button_type (path_bar, file); button_data->button = gtk_toggle_button_new (); atk_obj = gtk_widget_get_accessible (button_data->button); - gtk_button_set_focus_on_click (GTK_BUTTON (button_data->button), FALSE); + gtk_widget_set_focus_on_click (button_data->button, FALSE); gtk_widget_add_events (button_data->button, GDK_SCROLL_MASK); switch (button_data->type) diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index f2932a9a04..5c14ed0280 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -244,7 +244,7 @@ add_child (GtkWidget *widget, priv = gtk_stack_switcher_get_instance_private (self); button = gtk_radio_button_new (NULL); - gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + gtk_widget_set_focus_on_click (button, FALSE); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); update_button (self, widget, button); diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 719096fb16..cab852a34a 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -9542,7 +9542,7 @@ append_bubble_action (GtkTextView *text_view, GtkWidget *item, *image; item = gtk_button_new (); - gtk_button_set_focus_on_click (GTK_BUTTON (item), FALSE); + gtk_widget_set_focus_on_click (item, FALSE); image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); gtk_widget_show (image); gtk_container_add (GTK_CONTAINER (item), image); diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 82a3fc7726..57bfcb4dcb 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -698,7 +698,7 @@ gtk_toolbar_init (GtkToolbar *toolbar) gtk_button_set_relief (GTK_BUTTON (priv->arrow_button), get_button_relief (toolbar)); - gtk_button_set_focus_on_click (GTK_BUTTON (priv->arrow_button), FALSE); + gtk_widget_set_focus_on_click (priv->arrow_button, FALSE); priv->arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON); gtk_widget_set_name (priv->arrow, "gtk-toolbar-arrow"); diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 127168f812..cf1d2a32a3 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -352,7 +352,7 @@ gtk_tool_button_init (GtkToolButton *button, /* create button */ button->priv->button = g_object_new (klass->button_type, NULL); - gtk_button_set_focus_on_click (GTK_BUTTON (button->priv->button), FALSE); + gtk_widget_set_focus_on_click (GTK_WIDGET (button->priv->button), FALSE); g_signal_connect_object (button->priv->button, "clicked", G_CALLBACK (button_clicked), button, 0); diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index 7d362b2b6a..7d7990eae3 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -406,7 +406,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS priv->header = gtk_button_new (); g_object_ref_sink (priv->header); - gtk_button_set_focus_on_click (GTK_BUTTON (priv->header), FALSE); + gtk_widget_set_focus_on_click (priv->header, FALSE); gtk_container_add (GTK_CONTAINER (priv->header), alignment); gtk_widget_set_parent (priv->header, GTK_WIDGET (group)); @@ -2109,8 +2109,7 @@ gtk_tool_item_group_insert (GtkToolItemGroup *group, child_widget = gtk_bin_get_child (GTK_BIN (item)); - if (GTK_IS_BUTTON (child_widget)) - gtk_button_set_focus_on_click (GTK_BUTTON (child_widget), TRUE); + gtk_widget_set_focus_on_click (child_widget, TRUE); gtk_widget_set_parent (GTK_WIDGET (item), GTK_WIDGET (group)); } diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c index 8bc52e7cd8..66f226d89d 100644 --- a/gtk/inspector/window.c +++ b/gtk/inspector/window.c @@ -173,7 +173,7 @@ gtk_inspector_window_init (GtkInspectorWindow *iw) { button = gtk_button_new_from_icon_name ("find-location-symbolic", GTK_ICON_SIZE_MENU); - gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + gtk_widget_set_focus_on_click (button, FALSE); gtk_widget_set_halign (button, GTK_ALIGN_START); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); g_signal_connect (button, "clicked", -- 2.30.2